Have the artifact store work with a NIO lock directory inside GEOSERVER_DATA_DIR/tmp
Merge remote-tracking branch 'upstream/master'