JBIDE-15310 maintenance DEPENDS ON PR 121

First commit is from PR 121.  This is necessary because the unit test for this issue was updated in PR 121.