Merge branch 'stable-hotplug'

Conflicts:
	lib/cli.py
	lib/client/gnt_instance.py
	lib/cmdlib.py
	lib/objects.py
	lib/opcodes.py
	lib/rpc.py

Signed-off-by: Dimitris Aragiorgis <dimara@grnet.gr>