refs #27574
refs #2902
Merge remote-tracking branch 'origin/features/photo'

Conflicts:
	portlets/fileupload/src/main/java/com/aimluck/eip/fileupload/util/FileuploadUtils.java
Merge remote-tracking branch 'origin/master'