Bug#806831: Merging Bugs

[Michael Lustfield]

merge 806831 797812
merge 806831 790623
merge 806831 806779
tags 806831 + wontfix
retitle 806831 [Sticky] No New Modules or Flavors
thanks