Merges 2.0-maint into master

Conflicts:
  community/kernel/src/main/java/org/neo4j/kernel/impl/nioneo/xa/NeoStoreTransaction.java
Merge pull request #2007 from digitalstain/master

Merges 2.0-maint into master