Remove uses of deprecated dictionary concatenation (#1663) This removes the need for --incompatible_disallow_dict_plus