pushed to 2.5 w/ change to upstream CDT container strategy
will use Managed Builder solution for now.