Merge "Fix issue #10115327: MapCollections need to implement equals"