Merge "Revert "Revert "Update for using integers for major/minor versions in FQName."""