Partially revert "Updates and additions for dbuild 0.9.0"

This reverts commit e959d53ddb5044d74183752aa3b716b9bcd1a255.

Conflicts:
  common-2.11.x.conf
  community-2.11.x.sh