Sonar voilation fixes
Merging conflicts
Merge branch 'master' of github.com:rackspace/repose into kushala