misc: Merge branch hotfix v20.1.0.2 branch into develop
authorBobby R. Bruce <bbruce@ucdavis.edu>
Mon, 16 Nov 2020 19:25:23 +0000 (11:25 -0800)
committerBobby R. Bruce <bbruce@ucdavis.edu>
Mon, 16 Nov 2020 19:25:23 +0000 (11:25 -0800)
commitfcac22e098a1662285a4af8130d7f2ddc10994c5
tree32e53b8b76a8b31ea6114b63ace986f6b52da321
parent9a01d3e92765f14055756457403bbe4ecfce2d5b
parent0d703041fcd5d119012b62287695723a2955b408
misc: Merge branch hotfix v20.1.0.2 branch into develop

This merge commit also reverts the version info back to
'DEVELOP-FOR-V20.2' for the develop branch.

Change-Id: If6fd326cc23edf2aeaa67353d4d3fed573e9ddd6