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

                            + "from " + currRule.getName() + " to " + defaultRule.name);

                    // update default rule (if locale changed, name of rule will change)

                    AutomaticZenRule defaultAutoRule = createAutomaticZenRule(defaultRule);

                    // ensure enabled state is carried over from current rule

                    defaultAutoRule.setEnabled(currRule.isEnabled());

                    updateAutomaticZenRule(ruleId, defaultAutoRule,

                            "locale changed");

                }