move the ncs maven repository files back into the core for now
Merge branch '1.12'