Merge pull request #1016 from contiv/master

Merge master into release-1.1

Author: dseevr

scripts/netContain/Dockerfile

@@ -22,7 +22,7 @@ FROM ubuntu:16.04
 # ENV export https_proxy=https://proxy.localhost.com:8080
 
 RUN apt-get update \
- && apt-get install -y openvswitch-switch=2.5.2-0ubuntu0.16.04.1 \
+ && apt-get install -y openvswitch-switch=2.5.2-0ubuntu0.16.04.2 \
         net-tools \
         iptables \
  && rm -rf /var/lib/apt/lists/*