Fixing typo and adding check for system-wide instances.

git-svn-id: https://svn.apache.org/repos/asf/tomee/tomee/trunk@1582344 13f79535-47bb-0310-9956-ffa450edef68