core-5086 core-5087 changes for metadata template ui
Merge branch 'm_templates'

Conflicts:
	src/main/java/org/iplantc/core/uicommons/client/services/DiskResourceServiceFacade.java