I re-fixed the APM bug, edited the upgrade script, created an oracle upgrade script and bumped the acs-kernel version to 4.5.1. I found a few more changes that didn't get merged in, but fortunately none affect the datamodel. I've merged these in again.
Doing this made me realize how cool 'create or replace' is. It also makes sense to keep Oracle packages/PG functions in their own files (i.e. separate from datamodel creation, view creation, etc). This makes it possible to simply source the new files, rather than recopying the entire function in the upgrade script.