Merged oacs-5-6 to HEAD. HEAD now installs and passes all core tests. There may still be some lingering problems due to my screwing up the oacs-5-6 branch earlier, I'll be looking into this later.
Changed primary key constraints to meet our naming conventions, because the slightly non-standard name caused my pretty "no errors" page for this package to turn red :(.