Merge: fix the unit LockTest and make easier to find a spring configuration error with it, update arquillian deployer