Gh236 2i enhancements 1.4

Adds all new 2i features to PB and HTTP. 

Tests added to exercise.

Addresses #236 

**Do not merge until after 1.1.2**