work around temporary locking issue on amanda
Merge branch 'master' into RELEASE_20130723