Merge "Check rule package name in ZenModeHelper.addAutomaticRule" into tm-qpr-dev