CB-3620
Attach-detach disks
Merge branch 'origin/master'

Conflicts:
	gceapi/api/instance_api.py