ENTESB-2095 - make fabric resolver configurable

Conflicts:
	versions/6.1/etc/system.properties.erb