Merge pull request #90 from rhq-project/jshaughn/1111064

[1111064] Some code changes to avoid a locking issue.
Conflicts:
	modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java
	modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/operation/OperationManagerBean.java

Cherry-pick master merge commit: cec1e931ffdfbf0705b6b17358a25578a1462f7d