Merge pull request #1922 from wpaulino/avoid-remaining-redundant-commitment-broadcasts