[2.0] fixes #2478 Add/persist/retrieve was doubling the resultset of collection is solved. It was a merge in PersistentCollection creation. I am not 100% sure it is the right patch, but it works and does not break any other unit tests