Merge branch 'chandan/builddir-cachekey' into 'master'

buildelement: Ensure command-subdir is part of the cache key

Closes #1295

See merge request BuildStream/buildstream!1920