Merge "Move 'apt_mk_version' to defaults"