Move away from deprecated epl-find-installed-package
Merge branch 'artagnon-master'