Removed unused imports identified by sonar
Correct constant names identified by sonar
Removed some magic numbers identified by sonar
Merge pull request #689 from rackerlabs/sonar-cleanup

Sonar cleanup