Merge pull request from skangas/dir-locals

GitHub-reference: https://github.com/jwiegley/use-package/issues/1023

diff --cc lisp/use-package/bind-key.el
Simple merge

diff --cc lisp/use-package/use-package-core.el
Simple merge

diff --cc test/lisp/use-package/use-package-chords-tests.el
Simple merge

diff --cc test/lisp/use-package/use-package-tests.el
Simple merge