This is needed to simplify an intgrated AIO deploy Change-Id: I7b8a2314a23281a4369d431aba280e0c0dc66f22