Update to new cm-10.1 branches and remove forks