increase max allowed deadlock count from 100 to 200
Merge branch '2.1-maint'
increase max deadlocks allowed for cypher queries
Merge branch '2.0-maint' into 2.1-maint
Merge branch '2.1-maint'