fixing merge issues
CLOUDIFY-1488 Added private/public ip validations in bootstrap cloud.