Updates on deployment configs for Aether

Change-Id: If63e345bbd1e6789b8cce0ef94cbcabe79000351
32 files changed