Merge pull request #39 from apache/removeLib2

Enable felix cache locking again after it has been fixed