Merge "Fixes external network bridge and adds quota limits"
authorFrank Brockners <fbrockne@cisco.com>
Wed, 17 Jun 2015 18:06:38 +0000 (18:06 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 17 Jun 2015 18:06:38 +0000 (18:06 +0000)

Trivial merge