Merge pull request #374 from vedujoshi/R1.06

Fix merge issues from earlier commit
Merge remote-tracking branch 'upstream/R1.06' into R1.06
Fix merge issues from earlier commit
Use the new function name, thanks Musu
Merge pull request #375 from vedujoshi/R1.06

Use the new function name, thanks Musu
Merge remote-tracking branch 'upstream/R1.06' into R1.06
Merge pull request #373 from smusuvat/R1.06

R1.06
Merge remote-tracking branch 'upstream/R1.06' into R1.06
add missing commit in R1.06
Remove monkeypatch to avoid rare occurance of paramiko ssh sessions getting hung
Merge pull request #381 from vedujoshi/R1.06

Remove monkeypatch to avoid rare occurance of paramiko ssh sessions gett...
Merge remote-tracking branch 'upstream/R1.06' into R1.06
changes to single project test with simpler traffic test w/o flow rate measurement & launch mirror service instance