Merge "Add all services to scenario004-containers" into stable/pike