RAZ-2174 - Adding files from server doesn't work anymore : Issue Fixed.
Merge branch 'feature/issue_2174' into develop

Conflicts:
	global/cfc/assets.cfc
	global/host/dam/controller/circuit.xml.cfm