More progress on merging Roller's many modules into 2. 

Still have some work to do -> Tests run: 134, Failures: 1, Errors: 8, Skipped: 0

git-svn-id: https://svn.apache.org/repos/asf/roller/branches/fewer_modules@1488771 13f79535-47bb-0310-9956-ffa450edef68