Merged oacs-5-6 to HEAD. HEAD now installs and passes all core tests. Theremay still be some lingering problems due to my screwing up the oacs-5-6branch earlier, I'll be looking into this later.
More porting of the APM is complete! Nearly done, a bug in the datamodelAPI and we need to convert from direct use of blobs to using thecontent repository.