Merge branch 'feature/pc_identifiers' of
https://github.com/open-license-manager/open-license-manager.git into
feature/pc_identifiers
Conflicts:
src/library/hw_identifier/default_strategy.cpp
src/library/hw_identifier/identification_strategy.hpp
src/library/os/CMakeLists.txt
src/library/os/execution_environment.hpp
src/library/os/windows/cpu_info.cpp
src/library/os/windows/execution_environment.cpp
src/library/os/windows/isvm/BIOSReader.cpp
src/library/os/windows/isvm/BIOSReader.h
src/library/os/windows/os-win.c