fixed bug with edgeCollectionRestrictions
Merge branch '2.2' of github.com:triAGENS/ArangoDB into 2.2
Fixed a bug and a conceptional misunderstanding in GRAPH_NEIGHBORS

Conflicts:
	js/server/modules/org/arangodb/ahuacatl.js
	js/server/tests/ahuacatl-general-graph.js
Documentation fix of GRAPH_NEIGHBORS vertex restriction.
Fixed Orphan collections in general graph. They were not identifiable via AQL. Forgotten cherry-pick from devel
Merge branch '2.2' of github.com:triAGENS/ArangoDB into 2.2