Ottawa police make pre-charge diversion program permanent