Database constraints added in safe and sustainable fashion, with cleanup for upgrades. Template changes are clean. Marking as Passed QA.