F36 Change: Keylime subpackaging and agent alternatives (Self-Contained Change proposal)