Follow standard procedures for updating the main branch with two commits that were prepared for the rc2 branch.
Fix build script bugs
Create Portal 2.0.0 RC based on Firefly 2020.3, once it is available
Update 'suit' package build procedure to new online help system
Create a Portal application container image from Firefly 2020.2.0
Prepared PR. Split a commit from the now-defunct rc-2.0 branch to avoid an incompatibility with the current head of Firefly.
Most likely we will try to do an RC again when there is a 2020.3 release of Firefly available.
Merge looks good. Confirmed that it's working as expected in master.
After some difficulties (see DM-26851) we've gotten a successful build of the tip of suit:master (now labeled version 1.9.9 as a lead-in to 2.0.0) against firefly:dev. This is available on DockerHub as ipac/suit:test-20200922-6.