Merge remote-tracking branch 'upstream/develop' into feature/add-nodes-tab-ui

Conflicts:
	server/src/main/java/com/continuuity/loom/store/cluster/BaseSQLClusterStoreView.java