CORE-4073: Integrated file info argument propery field
Merge branch 'Ongoing'

Conflicts:
	src/main/java/org/iplantc/de/client/factories/WindowFactory.java