Those two branches were created for the purpose of providing a mechanism to generate the spack-cgcore and cmake-cgcore containers.
I see no benefit in maintaining them separate from the main branch history; I believe we should just include their respective files into main.