Port v31.2.5 hotfix#3351

pombredanne merged 7 commits intodevelopaboutcode-org/scancode-toolkit:developfrom

port-v31.2.5-hotfixaboutcode-org/scancode-toolkit:port-v31.2.5-hotfixCopy head branch name to clipboard