Fixes unit test regressions:
  * Delete mandatory collections since constraint cannot be expressed in DB schema
  * Fix NPE in flat type mapping when setValue is called with null "from" value.
(cherry picked from commit 6f4c563)