Merge branch 'master' of https://github.com/rackspace/repose into daley
Merge branch 'daley', remote-tracking branch 'origin'
Merge branch 'daley', remote-tracking branch 'origin'
Merge branch 'daley', remote-tracking branch 'origin'
Merge branch 'master' of https://github.com/rackspace/repose into daley
Fix Translation jmeter test for case of response entities