QPID-5138: Simplify file locking meachsnism and improve the implementation of prefgerences store

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