Remove release_stage if also present.
Merge branch 'releng/9.1.0' of https://github.com/freenas/freenas into releng/9.1.0