Add db-upgrade support to schema version 2.144
Fix imports and javadocs from previous commits