FELIX-3891 Fix the new way to avoid deadlocks, and preserve state change ordering, with an actual unit test

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