unified interface so the admin will not have to test for aws
Merge remote-tracking branch 'origin/develop' into develop