Branch is ready to be merged to master

Handful of bugs found and fixed when attempting to use gdeproxy with repose functional tests.
Merged latest master into this branch and resolved merge conflicts.  Verified repose tests are functioning correctly.