Merge changes I1149cb5b,Ib89a17aa

* changes:
  Allow condition providers to specify a rule instance limit.
  Verify zen rule owners before persisting rules.