DONT MERGE Fix/aws discovery and client/master

All clients connecting to aws enabled nodes get public ip addresses.