Resolve various Sonar issues
Merge branch 'master' of github.com:bserdar/lightblue