Merge pull request #133 from tevans/OF-857

OF-857: Fix C2S locking issues
Merge pull request #134 from tevans/OF-859

OF-859: Pubsub fix; misc cleanup
Merge pull request #135 from tevans/OF-857

OF-857: Improve thread pool management