Number of fixes related to elastic ips. Not using hostnames for most of the stuff, using public ips wherever possible.
Merge branch 'develop' into sg_mappings_inline