feature #1664: Fix chg cluster bug

Add chg cluster to datastore
feature #1664: Cosmetic changes
Merge branch 'feature-1664' of git.opennebula.org:one into feature-1664

Conflicts:
	src/sunstone/public/js/plugins/datastores-tab.js