Merge pull request rancher#1832 from cjellick/wsp

websocket-proxy v0.16.5

websocket-proxy v0.16.5

Merge pull request rancher#1824 from alena1108/upgradelockscale

set lockscale for the services created prior to when lock scale got in

Merge pull request rancher#1821 from ibuildthecloud/version

python-agent version

Merge pull request rancher#1817 from alena1108/countallin

No health state check on used indexes calculation

Merge pull request rancher#1813 from alena1108/missingstate

cancel-upgrade from finishing-upgrade state

Merge pull request rancher#1794 from alena1108/desiredScaleToMeta

desiredScale to metadata

Merge pull request rancher#1792 from ibuildthecloud/image-version-swap

Swap rancher.server.image and rancher.server.version

Merge pull request rancher#1790 from ibuildthecloud/version

rancher-net v0.4.2

Merge pull request rancher#1789 from ibuildthecloud/version

rancher-compose v0.8.5