Update cancel partner estimate
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/org/cloudbus/cloudsim/simulate/Simulate.java