Update by running adding boilerplate marker and running devel/tools/cmd-boilerplate
Remove two BEGIN blocks that were improperly marked with the boilerplate marker

They only survived because of a lack of /g in devel/tools/cmd-boilerplate
Merge branch '4.2/cmd-boilerplate'