Merge "Ensures zen rule update locale retains enabled val" into oc-mr1-dev