re-commit
moved tests from edge to nrv
Merge branch 'master' into jn-explicit-replica-resolver
code review fix, removed call-by-name, added tests
deleted old partial explicit resolver (only supported by replication) (now replaced with the new one)
Merge pull request #181 from wajam/jn-explicit-replica-resolver

Jn explicit replica resolver