Refs #7423: Updates from engines/bastion in Katello codebase.