policycoreutils/hll/pp: only print certain roles when declared in base modules

Some roles (i.e. user_r, staff_r, sysadm_r, system_r, unconfined_r) are
declared in the base module, and sometimes in non-base modules. This
could result in duplicate declarations of roles, which isn't allowed in
CIL. So for these roles, only generate their declarations if they appear
in a base module, otherwise ignore their declarations. All other roles
are printed regardlss of their declaration location.

Note that this means that if a policy author does not include one of the
roles in the base module then they will not be included in the resulting
policy, likely causing a compliation error in CIL.

Signed-off-by: Steve Lawrence <slawrence@tresys.com>
policycoreutils/hll/pp: fix typo in error messages

Signed-off-by: Steve Lawrence <slawrence@tresys.com>
Squashed 'libsepol/cil/' changes from 73f1e3f..15b955e

15b955e Fix typos in error strings
fe5a24e Disable declarations inside an optional even if in the first call pass

git-subtree-dir: libsepol/cil
git-subtree-split: 15b955ea49c86549661b6520a85291735ce5496c
Merge commit '847aa150e30e6147c28ed9807fae4dc232b5a8fe'
Bump to release candidate 4