fixing hardcoding to ArrayList
Merge branch 'di' into tags_and_ui

Conflicts:
	genie-server/src/main/java/com/netflix/genie/server/services/impl/jpa/ClusterConfigServiceJPAImpl.java