disable spinlock on ec2
Merge branch 'master' into ec2eval

Conflicts:
	rpc/utils.h
Merge branch 'ec2eval'