Merge "Adds external router and fixes metadata server"
authorFrank Brockners <fbrockne@cisco.com>
Wed, 3 Jun 2015 14:03:20 +0000 (14:03 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 3 Jun 2015 14:03:20 +0000 (14:03 +0000)

Trivial merge