[merge from branch to keep trunk up to date with upgrade history] prep for Metacat 2.1.1 release
View differences
[merge from branch to keep trunk up to date with upgrade history] prep for Metacat 2.1.1 release