CLOUDIFY-2508 replace all occurrences of the '.' char in machine and security group names to '-'.
CLOUDIFY-2508 fixed conflict