CLOUDIFY-2282 post blueprint simplifications