Merge pull request #135 from dadbodgeoff/remediation/security-convention-s6