[1157480] resolve a test issue by better supporting a missing
rhq-server.properties file if the --no-version-stamp option is specified.

(cherry picked from commit 8d200b8d2c03a1b8566680d6e92fb64dde26fd7c)
Signed-off-by: Jay Shaughnessy <jshaughn@redhat.com>
Merge branch 'release/jon3.3.x' of github.com:rhq-project/rhq into release/jon3.3.x
[1160682] Upgrade from JON3.1.2 to JON 3.3 CR01 with run-data-migrator option shows AuthenticationExceptio
This happened because the storage cluster schema is not yet created.  It
won't exist until 'rhqctl upgrade --storage-schema' is executed, after all
RHQ Servers have been upgraded and standalone SNs have been installed.

Removed the rhqctl upgrade '--run-data-migrator' option.  This option really
should never have existed, as for anything other than a basic topology it
would have failed, even in the past.  The data migration must be performed
after the full upgrade has completed, including the --storage-schema option,
using the command line tool: 'bin/rhq-data-migration.sh|bat <options>'

Also updated the upgrade/list-versions report to better instruct users
performing pre-storage-cluster upgrades (e.g. jon 3.1.2)

(cherry picked from commit 50524b32181b9b00455301df642248c6ce8d4f9a)
Signed-off-by: Jay Shaughnessy <jshaughn@redhat.com>
[1160669] Failed upgrade of standalone storage node is not correctly rolled back
This was true of any storage node upgrade failure, not just the new
db properties issue reported.  But the new properties is the most likely
new reason for a failure.  Changes to fail the overall upgrade on any
non-OK status returned from the storage upgrade.  This shouldbe safer, and
prevents the server from trying to upgrade if the storage upgrade has an
issue.

Also:
- added a specific error exit code for version stamp failure
- enhanced some undo task log messages

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