The Large Davenport Constant II: General Upper Bounds