Fix addressbook upgrade from pre-SHA1 versions