more tweaks to the hotfix script, the original no_proxy commit cannot be used due to conflict, the new no_proxy commit was missing two imports