D-16992 Clean up some code, added another test to account for Deproxy behavior
Merge pull request #867 from rackerlabs/D-16992

D-16992 Clean up some code, added another test to account for Deproxy