Merge branch 'subnet-routing-take2-#80656918'

[#80656918]

Signed-off-by: Steve Powell <spowell@pivotal.io>