Merge pull request #120 from wajam/manu-recovery-integration

Consistency recovery integration
Do not put service member down on consistency error. Not ready yet!!!
Merge pull request #122 from wajam/manu-consistency-workaround

Do not put service member down on consistency error. Not ready yet!!!
Proper workaround

The code is still wrong but at least it is not executed when tx log is disabled (as it should be).
Merge pull request #123 from wajam/manu-consistency-workaround2

Proper workaround
Merge branch 'master' into manu-consistency-state

Conflicts:
	nrv-core/src/main/scala/com/wajam/nrv/consistency/ConsistencyMasterSlave.scala