Update notes for submitted changes

* d2-common: clean-up ifdefs for d2 stepbrothers