Clean up local state paths

Puts additional state and lock paths for swift, quantum and nova
into $DATA_DIR/project that can be set independently of $DEST.

Change-Id: I2cca701856d3caa7fe472fefdd8b070a3c7f3adf
diff --git a/lib/nova b/lib/nova
index dbfc294..f428895 100644
--- a/lib/nova
+++ b/lib/nova
@@ -316,6 +316,7 @@
     fi
     if [ -n "$NOVA_STATE_PATH" ]; then
         add_nova_opt "state_path=$NOVA_STATE_PATH"
+        add_nova_opt "lock_path=$NOVA_STATE_PATH"
     fi
     if [ -n "$NOVA_INSTANCES_PATH" ]; then
         add_nova_opt "instances_path=$NOVA_INSTANCES_PATH"