UNCLASSIFIED - NO CUI

Continued consistency improvements for bb-common

In #3129 (closed) most of the packages were brought into alignment, but some packages are still using merge instead of mergeOverwrite:

Edited by Andrew Shoell