#974 - Don't allow the MapFieldPersistenceProvider to run if the RuleFieldPersistenceProvider has already run (avoids overriding dirty state detection)
(cherry picked from commit cfa8709)