Merge branch 'jshaughn/1139735'

Conflicts:
	modules/common/cassandra-installer/src/main/resources/module/main/module.xml
(cherry picked from commit 281e1bc21252e4f15e2af7fa079fe200231895bf)

Conflicts:
	modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java
[1139735]
Add undo of the storage node version stamping in case of an upgrade failure
invoking undo logic.   The current thinking is that this is not necessary for
the server stamp since it happens at the end of server upgrade.

Also, deprecate the upgrade --start option and make it do nothing if specified.
This is because upgrade is a multi-step process and as such an automatic
start does not make much sense, and more likely will cause problems. Start
should only be done manually, after all upgrade steps are complete.

(cherry picked from commit 6bc27076ce1a8aee205ede7c30ff83285e23d8f4)
Signed-off-by: Jay Shaughnessy <jshaughn@redhat.com>
[BZ 1139735] Storage node schema version should not be attempted to upgrade in case of clean installation

(cherry picked from commit a6ac0b9a43a330f43bc6c160410807e988e6228f)
Signed-off-by: Jay Shaughnessy <jshaughn@redhat.com>