Fix adding builder Gem for system Ruby
Fix statemachine for upgrading Python setuptools