Include element-manifest element
Add needed patches and add support for figuring the true amount of status to pass to wait_for_hypervisor_stats