Merge "Remove maintenance loopback container" into stable/phosphorus