More robust upgrade which will convert even if old phoenix jar is in place on server
Bug fixes for automatic upgrade