[MERGE] Redundant VPC routers and persistent router config

[Daan Hoogland]

H,

I will merge our feature/systemvm-persistent-config into master. If
you have objections please let me know before tomorrow.

@john: your comment was addressed in the present day version.

-- 
Daan