Update master branch

* Add cli settings to vshield edge
* Add tenant fqdn
* Fix remotecli during deployment