Merge "Don't depend on classes-header.jar when turbine is disabled"