Specify which SCM profiler should be selected by CookbookLocks
Check parent directories for .git dirs when determining SCM
Merge branch 'subdir-cookbooks-git'