Merge "Remove maintenance loopback container"