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
LRDOCS-514 Backport fix to 6.1.x
Merge pull request #572 from jrao/LRDOCS-514-6.1.x

http://issues.liferay.com/browse/LRDOCS-514
Backport rbohl's - LRDOCS 340 and 436, Chapter 10, APIs--Addressing Rich's comments.
Backport rbohl's - LRDOCS 340 and 436, chapter 10-APIs. Initial addressing of Rich's review
is complete. This chapter will now go to review by Jim.
03-portlet* - remove old portlet-info description paragraphs
Backport - 08-maven - Reformat ordered list
Backport - 09-liferay-ide - Reformat ordered lists
10-apis - Fix table format
10-apis - Use fixed-width font for message bus keys
03-portlet* - remove old portlet-info description paragraphs (reverse-merged from commit f9c5bc812e12501c51bb15665a801fa9c64dd894)
Backport - Merge devGuide - 03-portlet - fix lists, fixes for portlet-info, and some typos
10-apis - Add new header IDs and renumber figures.
Backport rbohl's - LR DOCS 340 and 436, Chapter 11 Wordsmithing and Formatting.
Backport rbohl's - LRDOCS 340 and 436, Wordsmithing and Formatting Chaapter 11.
LRDOCS 340 and 436, wordsmithing and formattin chapter 11, Frameworks.
LRDOCS 340 and 436, Wordsmithing and Formatting. Chapter 11.