Enhancement/379/cmapi basemap change



<!---
@huboard:{"order":238.078125,"milestone_order":380,"custom_state":"ready"}
-->