Merge remote-tracking branches 'opf/feature/squashed-migrations' and 'opf/feature/normalize_acts_as_journalized' into integration/normalize_acts_as_journalized