CDB-2077 bad merge fix
fixed CDB-2078 (https in public map)
Merge remote-tracking branch 'origin/CDB-2078'