Do not build vrouter with -i; substitute one occurence of 'production' with 'debug'.
Update local_manifest.xml
In localrc change em0 to em1
Prepend  before occurences of /etc.
Fix condition checking if we're on freebsd to stop zookeeper.
Make test_insert_vrouter() FreeBSD-compatibile.
Typo in fixup_config_files().
Prepend  in _rewrite_ifcfg_file().
Fix 0 comparison in start_contrail().
Another implementation of test_insert_vrouter().