CDB-1871 #resolves Fixes specs related to the new private_maps var
Merge CDB-1871 into release/2.10.1