Make 2.0 upgrader module database agnostic.
Refactors the contents converter in 2.2 upgrader module.