standard
Prediction adapted to be less aggressive
Merge branch 'master' of https://github.com/icuadrado/nimbus

Conflicts:
	service/service/java/source/src/org/globus/workspace/async/AsyncRequestManagerImpl.java
	service/service/java/source/src/org/globus/workspace/manager/DelegatingManager.java