Merge pull request #941 from ddurnev/master

[RJA-658][feature]: Added default system service.
[RJA-658][feature]: Use more generic 'wrapper.key' system property to detect wrapper presence.