JBIDE-15310 explicit jpp6.1 support DEPENDS ON PULL 120

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