FELIX-4348 async locate service deadlock test

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1556078 13f79535-47bb-0310-9956-ffa450edef68
FELIX-4348 fix the deadlock, and use one less lock

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