changelog: move 18.02.x branching cherry-picks to 18.02-1~git1