Fixes #1135 - Use the encoding attribute from EmailInfo to create an email message
Fixes #1168 - Protect against an NPE when checking if a collection relationship is required
Fixes #1164 - Unwrap the id property for order payment to fix a problem where no payments could be removed from REST APIs
Fix #1080 - Actually add the request query string to request dto for rule builders
Fixes #1173 - Exclude the JDK tools jar to prevent IDE import issues in non-OSX environments. Also do some opportunistic formatting refactoring
#1174 - Add placeholders for all source folders to ease IDE project management between branches
Merge branch 'BroadleafCommerce-3.0.x' into BroadleafCommerce-3.1.x
Remove placeholders no longer needed from #1174
Merge branch 'BroadleafCommerce-3.1.x' into develop
Remove placeholders no longer needed from #1174