Commit missing files that actually belong to previous commits. Sponsored by: Citrix Systems R&D Approved by: gibbs