carbon2-commit: Rebase with removal of netinstall on trunk