Merge pull request #638 from rackerlabs/D-13944

D 13944
Merge branch 'master' of https://github.com/rackerlabs/repose into HDR_XLATE
Merge branch 'HDR_XLATE' of https://github.com/rackerlabs/repose into HDR_XLATE