Add marketplace, service_broker and mysql builds back