Rebasing: All core guides - rebasing topics in CCMS

Apply to master and 4.1.x