Revert "Revert "packages, fhs: fix saxon includes/excludes expression""

This reverts commit 358648b0c13fe7e553de43125f7c355938e67732.

The saxon changes were unrelated to the xacml/opensaml problem