Refactoring work that includes: 1) Concurrency fixes, 2) small redesign, 3) optimizations, 4) code cleanup.

git-svn-id: http://svn.igniterealtime.org/svn/repos/wildfire/trunk@6713 b35dd754-fafc-0310-a699-88a17e54d16e