commit from master
Merge branch 'master' of https://github.com/c3isecurity/XCCDF-Remediation

Conflicts:
	test