Fixes to mitigate upgrade issues (e.g. avoid fatal errors).
Better status reporting.
Version bumped from 7.x-2.0-rc3 to 7.x-2.0-rc4
Merge branch 'release-7.x-2.0-rc4'