[WCP-32] [WCP-16] - Fixed issues with Spring 3.1 and upgraded to
portlet-api 2.0.  For email integration I just moved config to
webapp.properties and created a test case.