Merge "SwiftFileBackend::resolveContainerPath() check the proper length"