Use PersistentResourceDefinition; take advantage of WFCORE-102 improvements
Update to use WFCORE-102 improvements; misc other improvements