Allow Criteria and CriterionOption name changes

No longer supports re-ordering of options and criteria, but allows name change.

@wedaly The updated tests are good but I cannot respin my sandbox remotely, and I can't seem to get to supervisor to restart mine. Going to try and verify but if you hit my sandbox and get it restarted let me know.