Sonar voilation fixes
Merging conflicts
Merge branch 'master' of github.com:rackspace/repose into kushala
Merge branch 'daley', remote-tracking branch 'origin'
Merge branch 'master' of github.com:rackspace/repose
Merge branch 'master', remote-tracking branch 'origin' into daley
Fix regression build