Merge "Make list methods consistent for container client"