Merge HttpProxy/Host and Brokered Proxy/Host updates

* Closes #268
* Adds changes for #269