Fix a bug in modifying AQL when REPLACE/UPDATE uses DistributeNode.
Fix a test because now more queries use DistributeNode.
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel