am 6d00d54e: Merge "Ensuring disabled packages remove all components on the workspace. (Bug 11172454)" into jb-ub-now-jetsonic

* commit '6d00d54ea1ec1330de4ffc1daf4b507e3cdaeb72':
  Ensuring disabled packages remove all components on the workspace. (Bug 11172454)