Merge branch '2.2' into 3.0

# Conflicts:
#	gns3server/schemas/qemu_template.py
#	requirements.txt
#	tests/compute/qemu/test_qemu_vm.py
#	tests/handlers/api/compute/test_qemu.py

gns3server/configs/iou_l2_base_startup-config.txt

@@ -13,7 +13,8 @@ logging console discriminator EXCESS
 !
 no ip icmp rate-limit unreachable
 !
-ip cef
+! due to some bugs with IOU, try to change the following line to 'ip cef' if your routing does not work
+no ip cef
 no ip domain-lookup
 !
 !

gns3server/configs/iou_l3_base_startup-config.txt

@@ -12,7 +12,8 @@ no ip icmp rate-limit unreachable
 !         
 !
 !
-ip cef
+! due to some bugs with IOU, try to change the following line to 'ip cef' if your routing does not work
+no ip cef
 no ip domain-lookup
 !
 !