Make the mail import optional
Merge pull request #1277 from markewallace/MailImportOption

Make the mail import optional
Add new properties for controlling initialization. Load required
services for OSGi support.
Merge pull request #1278 from markewallace/RegPath

Add new properties for controlling initialization. Load required
Changes to LibraryServlet, support for removing dojo.registerModulePath
fixed

Changes to LibraryServlet, support for removing dojo.registerModulePath
fixed
Merge remote-tracking branch 'origin/master' into libraryServlet-regpath

Conflicts:
	sdk/com.ibm.sbt.core/src/main/java/com/ibm/sbt/jslibrary/servlet/AbstractLibrary.java
	sdk/com.ibm.sbt.core/src/main/java/com/ibm/sbt/jslibrary/servlet/LibraryRequest.java
Fix bad merge commit

Fix bad merge commit
Merge pull request #1279 from CarlosManias/libraryServlet-regpath

Library servlet regpath
Library Request Configuration and SBT Web Resources
Add some additional options to configure the library request.
Add the code for the sbt.web.resources plugin/feature/updatesite.
Merge pull request #1280 from markewallace/LibraryRequestConfig

Library Request Configuration and SBT Web Resources
Update Static JavaScript
Update static copy of JavaScript used by sbt.web.resources. Eventually
this code will be dynamically generated by the build.
Merge pull request #1281 from markewallace/UpdateWebResourcesNls

Update Static JavaScript