Merge branch 'release/2.6.0.4' into develop
Bump version to 2.6.0.5dev
Update PYPI metadata on setup.py
Resolved flake8 issues #2202

Review ID: 373003
Merge pull request #17 from priyankarani/feature/task-2202

Resolved flake8 issues #2202
Bump version to 2.6.0.5
Merge branch 'release/2.6.0.5'