; Merge from origin/emacs-26

The following commit was skipped:

36edb6c CC Mode: stop distinguishing brace blocks from defun blocks b...

diff --cc lisp/progmodes/cc-engine.el
Simple merge