FL-1631: additional cleanups and documentation to keep our merge steps organized and in order.