tweaks to v150 upgrade script; ensure we truncate before resetting rules tables
adjust how we handle activity record cleanup when the source contact is deleted permanently
Merge branch 'dev' into test