ISIS-354: minor edits to get the tck demos to work again
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/isis