Fixed the deprecated pylint message
Merge branch 'master' into config-json-handler