fixes in RC related to incorrect merge
This commit was manufactured by cvs2svn to create branch 'unlabeled-1.37.2'.
Got a suggestion or an issue? Discuss it on the Atlassian Community or visit Atlassian Support for other options.