Merge pull request #2949 from tomponline/tp-veth-routes

network: Adds veth static routes feature

diff --cc src/lxc/confile.c
Simple merge

diff --cc src/lxc/confile_utils.c
Simple merge

diff --cc src/lxc/network.c
Simple merge

diff --cc src/tests/parse_config_file.c
Simple merge