Use eupsForScons, not eups.  Provide a dummy if eups isn't available
Moved locking code into try block (thanks KT)
Merge branch 'u/rhl/DM-1165'