fixed duplicate nunit reference
Merge branch 'ValidUntil'
should not complete when running transactionless
Merge branch 'hotfix-6.0.2' into develop