Conflicts:
	lib/hypervisor/hv_kvm.py
	lib/opcodes.py
	 - Merge

Signed-off-by: Apollon Oikonomopoulos <apollon@noc.grnet.gr>