File locks were creating boot.properties files

Now only lock if local boot.properties file already exists. A potential
race condition. Better way to fix this? I'm all ears.
Merge branch 'v2-nevergreen' of gh:tailrecursion/boot into v2-nevergreen