Make sure we get the initializers even if the persister is created programmatically (it's created that way in way too many places...)
Merge remote-tracking branch 'aaime/xstream-custconv' into feature-wfsng-storedquery
Reverted hack that was no longer needed after previous merge