am 0751d1ea: am deb69370: Revert "Add ordered broadcast when removing packages." Couple of cosmetic fixes as well.

Merge commit '0751d1eaad55603eaeb0f035a55935f713ab0476' into kraken

* commit '0751d1eaad55603eaeb0f035a55935f713ab0476':
  Revert "Add ordered broadcast when removing packages."