Fixes: U4-4789 PluginCache doesn't update with code defined PropertyEditors in package and publicizes a couple things
Merge branch '6.2.1' into 7.1.3