Merge pull request #942 from ddurnev/master

[RJA-658][feature]: Use more generic 'wrapper.key' system property
[RJA-2175][fix]: Use String indexOf() not contains().