Merge "Add all services to container scenarios" into stable/pike