fixes for releasing
Merge pull request #9078 from ricardoquesada/releasing_fixes

fixes for releasing