CLOUDIFY-1535 Removed unused configuration property.
Merge remote-tracking branch 'origin/develop' into develop