Merge "Don't use creationTime for ZenRule equality"