Fix global of CURRENT_VERSION + other things that pylint points out
Merge pull request #1969 from jmullan/feature/fix_CURRENT_VERSION

Fix global of CURRENT_VERSION + other things that pylint points out