Reduce scope of variable
Check emptiness using empty
Reduce scope of variable
Merge pull request #1129 from hansjoachim/cppcheck-fixes

Cppcheck fixes
Do not override environment compiler flags
Merge pull request #1133 from Ablu/fedora_packaging_for_upstream

Do not override environment compiler flags
Properly handle merge stacks in equipment inventory

Fixes #1137