CDB-1084 #resolves Fixes basemap related specs. Fixes create layer dialog specs.
Merge remote-tracking branch 'origin/fix/CDB-1084' into release/2.5.3

Conflicts:
	lib/assets/test/spec/cartodb/table/new_layer_dialog.spec.js