Remove unused files.
First pass at migrating from JMock to Mockito
Update branch with latest changes from master
Complete removal of JMock
Merge remote-tracking branch 'upstream/master' into wicket