Fix incorrect update to git-flow-avh 1.5.1

Closes #18559.
Closes #18564.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>