Set default lock_path in state_path

* Set the default lock_path to be within quantum's state_path
* Fixes bug 1107950

Change-Id: I346d6088d773b508b4a7ba925fdc91fd4f5bf160
Merge "Set default lock_path in state_path"