More progress on merging Roller's many modules into 2. Still have one compilation error that requires a little new code to fix.

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