Merge "[DMaaP] Wait for AAF locate before AAF config"