Fixed merge
Merge branch 'el_startup_issues' of github.com:dgroulx/neo4j-server-chef-cookbook into el_startup_issues