Squashed merge of neo4j vcap fixups:

install neo4j when ALL_SERVICES is set
create neo4j instances dir during setup
bump services submodule pointer

Change-Id: Iaf3933031823beedd344694afd05ee520e4ee5bf

setup/vcap_setup

@@ -514,27 +514,34 @@ else
     echo "MongoDB Server (version $MONGODB_VERSION) is current"
 fi
 
+if [[ $ALL_SERVICES != true ]]; then
+    read -p "Should I add Neo4j Server? [y/N] "
+    if [[ $REPLY =~ ^[yY]$ ]]; then
+        NEO4J=true
+    fi
+fi
+
 NEO4J_VERSION=community-1.4.1
 NEO4J_DIST_FILE=neo4j-community-1.4.1-unix.tar.gz
 NEO4J_SERVICE_DIR=/var/vcap/services/neo4j
 NEO4J_HOSTING_EXTENSION=authentication-extension-1.4.jar
 if [[ -f "$NEO4J_SERVICE_DIR/$NEO4J_DIST_FILE" ]]; then
-   echo "Neo4j ($NEO4J_VERSION) is current"
+    echo "Neo4j ($NEO4J_VERSION) is current"
 else
-read -p "Should I add Neo4j Server? [y/N] "
-if [[ $REPLY =~ ^[yY]$ ]]; then
-    echo "Installing Neo4j Server (version $NEO4J_VERSION)"
-    pushd .
-    mkdir -p $NEO4J_SERVICE_DIR
-    cd $NEO4J_SERVICE_DIR
-    curl -O http://dist.neo4j.org/$NEO4J_DIST_FILE
-    rm neo4j-server.tgz
-    ln -s $NEO4J_DIST_FILE neo4j-server.tgz
-    curl -O  http://dist.neo4j.org/$NEO4J_HOSTING_EXTENSION
-    rm neo4j-hosting-extension.jar
-    ln -s $NEO4J_HOSTING_EXTENSION neo4j-hosting-extension.jar
-    popd
-fi
+    if [[ $NEO4J == true || $ALL_SERVICES == true ]]; then
+        echo "Installing Neo4j Server (version $NEO4J_VERSION)"
+        pushd .
+        mkdir -p $NEO4J_SERVICE_DIR/instances
+        chmod -R 777 $NEO4J_SERVICE_DIR
+        cd $NEO4J_SERVICE_DIR
+        curl -O http://dist.neo4j.org/$NEO4J_DIST_FILE
+        rm neo4j-server.tgz
+        ln -s $NEO4J_DIST_FILE neo4j-server.tgz
+        curl -O  http://dist.neo4j.org/$NEO4J_HOSTING_EXTENSION
+        rm neo4j-hosting-extension.jar
+        ln -s $NEO4J_HOSTING_EXTENSION neo4j-hosting-extension.jar
+        popd
+    fi
 fi