2.1 Upgrade issues fixed

Several issues relating to the upgrade process have been resolved to provide a more trouble-free upgrade process. (Bug IDs 18815298, 18767222, 18900135)