UP-3704 : Added null check to a loop when collecting grouping
information.
Merge pull request #126 from timlevett/UP-3704

UP-3704 : Added null check to a loop when collecting grouping
UP-3701 : Fixed logging issues for startup listener classes so that the logger doesn't get initialized before the webapprootkey is initialized causing logging to fail.
EMAILPLT-133 Bundle new version of email preview
UP-3706:  Database connection settings for the Attachments portlet are hard-coded
Merge remote-tracking branch 'upstream/rel-4-0-patches' into rel-4-0-patches
UP-3706 Fix mvn db-init
Merge remote-tracking branch 'jasig/rel-4-0-patches' into FEATURE-dlm-channel-into-sidebar