Ptoblem trying to restore RTC backup

Hi all,

I'm in the process of setting up backup and restore procedures for our RTC install.

The process should be pretty os/db agnostic:

Back up the server/conf directory (except the site, provision_profiles and derby directories)
Back up the server/tomcat/conf directory.

Use repotools-jts -export to back up the JTS database.
Use repotool-ccm -export to back up the ccm database.

At the moment, I'm trying to restore using the following process - This is onto a different machine.

Reinstall RTCV3 from scratch.
Start the server
Run through the server Setup
Shut down the server
Copy the tomcat-users.xml file from the backup
restore the ccm database using repotools-ccm -import
restore the jts database using repotools-jts -import
start the server
run through the setup

Voila!! - in theory...

This works mostly until I get to the final setup. The ccm application is recognised as already registered and I don't have the opportunity to change it. So, after the setup, I go into the server admin and the registered applications section and there it is, with the wrong discovery URL.
Clicking on the edit button seems to offer the opportunity to change the url. However, when I change it and click Finish, the url doesn't appear to have been updated.

I then try and run setup again. This time after the register applications page I can go on and view the ccm setup pages - including the public uri page which I can set to the correct public uri. Hooray! - I've cracked it!

So, I run through to the end of the setup. When I click finish, I'm taken to the admin page and go to the registered applications page. There is the CCM application still with the original incorrect discovery uri listed and I can't access the ccm application from the house icon either, it says 'This application is not configured for communication with <wrong> . If you are an administrator, please run the Jazz Team Server setup wizard.

I've tried running the setup a number of times and I've looked through the admin web pages and other than the things I've already tried, I can't find another way to update the URI of the CCM application.

Am I running into a bug here?

Thanks.