LRDOCS-657: Remove "Folder" setting for File Upload
Merge pull request #563 from codyhoag/file-upload-6.1.x

File Upload - incorrect setting
LRDOCS-666 Backport jboss-classloading.xml contents rendering fix to 6.1.x
Merge pull request #568 from jrao/LRDOCS-666-6.1.x

http://issues.liferay.com/browse/LRDOCS-666