CLOUDIFY-1395 Improving the user experience during initial setup, bug fix.