Description of problem:

Files:

1. <RHQ_SERVER_HOME>/modules/org/rhq/server-startup/main/deployments/rhq.ear/lib/rhq-server-metrics-4.12.0.JON330GA-redhat-2.jar
2. <RHQ_SERVER_HOME>/modules/org/rhq/server-startup/main/deployments/rhq.ear/lib/rhq-cassandra-schema-4.12.0.JON330GA-redhat-1.jar

are introduced with JON 3.3.0 update 02 but are not needed in JON 3.3.0 update 03. However, above files are not removed when update is done via JON 3.3.2 (JON 3.3.0 -> JON 3.3.2 -> JON 3.3.3) and because of that, after JON Storage node is restarted,  JON Server does not change it's status from MAINTENANCE to NORMAL. Also, because of this JON Agent does not reconnect to the JON Server.


Version-Release number of selected component (if applicable):
JON 3.3.2 -> JON 3.3.3

How reproducible:
Always

Steps to Reproduce:
1. Install JON 3.3.0;
2. Upgrade JON 3.3.0 to JON 3.3.2;
3. Upgrade JON 3.3.2 to JON 3.3.3;
4. Stop JON Storage Node (./rhqctl stop --storage);
5. Confirm that JON Server is in `MAINTENANCE` mode;
6. Wait until JON Agent is backfilled and then start JON Storage node;

Actual results:
JON Server is still in `MAINTENANCE` mode and JON Agent cannot register with the JON Server.

Expected results:
Restart of the JON Storage Node changes status of the JON Server to `NORMAL` and JON Agent is able to register with the JON Server.

Additional info:
When direct upgrade is done (from JON 3.3.0 to JON 3.3.3), this issue does not exist. 

To fix this, change the upgrade script (JON 3.3.0 upgrade 03) to remove above files if they exist.