MDL-42414 cleanup and fix increment_revision_number() unit test