KNL-1286 merge 312000 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/kernel@312248 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1276 Don't fail with List ResourceProperties.

When exporting users in a site archive ResourceProperties that are lists are exported, but when re-importing these values aren't correctly save as our DB schema doesn't support them. These values were originally present in the export through the UserDriectoryProvider creating them.

git-svn-id: https://source.sakaiproject.org/svn/kernel@312264 66ffb92e-73f9-0310-93c1-f5514f145a0a