merged with 2.1.7 up to [5986:c3e1c72584ad]
[2003] Package renaming for classes extending PersistentObject
[2003] Package renaming for classes extending PersistentObject
[2003] Package renaming for classes extending PersistentObject