[PATCH] [Fedora] Apply further changes motivated by scap-security-guide Fedora RPM review request (RH BZ#1018905, c#8)