Upgrade should only try once

.. since it prohibits startup when fails.
.. suspect there is an issue with optimise() on a new index
.. have also added more logging to watch this.
RC5 Update Build ID and String

.. build 3005.
merge master into personal