Added support for client, and hostname adjustment for aws servers.
Removing these from git tracking.