CDB-728 - Fix mapviews conditional message
Merge branch 'feature/CDB-728' into release/2.6.0

Conflicts:
	lib/assets/javascripts/cartodb/dashboard/dashboard_messages.js