cardiff: Fixing more stylish issues
cardiff: Fixing more stylish issues

enovance/edeploy,redhat-cip/edeploy,lebauce/edeploy,enovance/edeploy,redhat-cip/edeploy,redhat-cip/edeploy,enovance/edeploy,lebauce/edeploy,enovance/edeploy,lebauce/edeploy,redhat-cip/edeploy,lebauce/edeploy