fix merge issues when merged in from master branch

Fix error:
NameError: global name 'distro' is not defined