regdb: update to kk_3.5 and fix conflicts