Merge changes Iee382756,I473f022c

* changes:
  Allow overriding docker version in prepare-docker-dind
  Specify source ip for rancher agent