include verify into failsafe again to make build fail on ITests too, fixed failing ITests
check lockDir later if it is dir
Merge remote-tracking branch 'remotes/upstream/master'