Merge pull request VOLTTRON#2303 from VOLTTRON/develop

Develop

Merge pull request VOLTTRON#2137 from craig8/comment_out_vc_upgrade_t…

…o_2_3

remove vc vcp temporarily

Merge pull request VOLTTRON#2065 from VOLTTRON/releases/6.x

Bumped version to 6.0

bump version to volttron 6.0-rc1

Merge pull request VOLTTRON#1793 from VOLTTRON/pre-5.1-release

Release 5.1

Merge branch 'master' into upstream-releases/5.x

Bump version 4.x to 4.1.1

Merge pull request VOLTTRON#1663 from craig8/fix-bootstrap-issue

Bumping version number after bootstrap fix

Merge pull request VOLTTRON#1657 from craig8/bump-5.0.1

Bump version 5.0.1

Merge pull request VOLTTRON#1647 from VOLTTRON/releases/5.0rc

Move 5.0 to master branch