Merge "Start creating/using separate configs for api/manager"