#967 - Fixed typo.   Ensure that default tracker does not use a name.
#974 - Don't allow the MapFieldPersistenceProvider to run if the RuleFieldPersistenceProvider has already run (avoids overriding dirty state detection)
(cherry picked from commit cfa8709)
Merge remote-tracking branch 'origin/BroadleafCommerce-3.1.x' into develop