CLOUDIFY-1808 fix checkstyle/build errors