Builder updates to support building of both Community and Commercial editions.