CLOUDIFY-1646 changed some method signatures and resolved checkstyle issues