Merge pull request #411 from apache/feature/conan_find_module_unification