Merge "Add DefaultContainerService to CleanSpec." into qt-dev