Cherry pick python upgrade patches into master#268

mlim19 merged 2 commits intomasterintel/granulate-utils:masterfrom

upgrade-python2intel/granulate-utils:upgrade-python2Copy head branch name to clipboard