resolve conflicts of Toshiaki Hatano (haeena)'s vxlan branch
fix rpm/deb build error caused by moving systemvm to its own maven project