fix #8560
Merge pull request #8672 from s0undt3ch/0.17

Add the missing parts of the previous cherry-pick.
Merge pull request #8689 from s0undt3ch/0.17

0.17 - Lint Fixes
Merge pull request #8668 from terminalmage/0.17

Fix for #8560
Because of packages like 'xen-tools-4.1.3_3', let's use regex.