Adding missing commit related to tor proviosning.
Adding missing commit related to tor proviosning.

Adding few of the commit missed in master branch but present in R2.1
Sysncing bot the codebase.

Change-Id: Ia82bb5836a4aee044336c3fbf60c2d1b9647b355

Juniper/contrail-provisioning,Juniper/contrail-provisioning