Address Checkstyle violations
Merge origin/master
Added profitbricks module to parent pom