Fix flaky tests
Only run oracle tests for oracle and master branches
Move oracle renames to after :app_events rename.  Also clean up CPE.