Merge branch 'master' of https://github.com/AyolaJayamaha/helix

Conflicts:
	helix-admin-webapp/src/main/java/org/apache/helix/webapp/resources/ClustersResource.java
Merge branch 'master' of https://github.com/AyolaJayamaha/helix