Merge pull request conan-io#12515 from conan-io/develop2

Merge develop2 to release branch

fix test (conan-io#12480)

Merge branch 'develop2' into release/2.0-beta

Conan 1.53.0

update ci

fixed bad parameter and added test (backported from Conan 2.x) (conan…

…-io#11991)

remove nones from paths (conan-io#11893)

Merge pull request conan-io#11845 from czoido/fix_pyinstaller

Port pyinstaller fixes from 1.51

Merge pull request conan-io#11831 from czoido/port_11823_to_1.51.2

Port 11823 to 1.51.2

Fix cmake layout path (conan-io#11809)

* Replace string format with os.path.join

* add test

Co-authored-by: Anthony <[email protected]>