Merge pull request #7354 from pschmitt/master

Use 'command -v' to detect whether and where software is installed (instead of 'which')

diff --cc apps/files_external/lib/config.php
Simple merge