Unable to Access JIRA after upgrade to JIRA Software (JIRA 7) due to expired license

Steps to Reproduce

1. Install JIRA version prior to JIRA 7
2. Install JIRA Service Desk and used an expired license
3. Create an XML Backup.
4. Install JIRA Software and in the setup wizard choose "Import from Backup" to upgrade.
5. Move the previous generated XML Backup to the JIRA Software Import Folder.
6. Type the backup name to proceed on restoring the data.
7. Wait until it finished.

Expected Result:

With JIRA License that will be used by JIRA Software, it will ignore JIRA Service Desk license and the restoration will be finished.

Actual Result:

There will be an error that is complaining about the Expired JIRA Service Desk license.

Workaround:

1. Click on the hyperlink below the details of the error to move to the next page.
2. Then, remove the expired license by selecting the 3rd choice.
   
3. A page with "Update License" will come up.
   
4. Restart the instance after it.

Notes:

• Updating the license with the existing JIRA license would not work.
• Updating the license with an evaluation license would also not working.
• Both due to JIRA actually update only JIRA Softoware license, not JIRA Service Desk license even for evaluation.
• While selecting "Remove the Expired License" works, it only show the page with panel below that can be confusing. There should be an info to restart the instance.
  
• Kinda expecting like the previous version of JIRA where it still a plugin, as long as JIRA license is not expired it will still possible to upgrade