Bump master version to 3.6.0
Delete old versions of packaged modules
Merge pull request #6371 from vishalduggal/bump_version

Bump version