CLOUDIFY-1335 refactor props injection. remove un-necessary injection and support availability zones