Unify all templates into a single tree, no more CE vs PRO distinction. Handle inactive nodes, and CARRIER systems. Change-Id: Id2800e0cc746233cb69a1b9a09769f26aa9c2a5d