Collecting water from cauldrons with buckets in Creative mode is still inconsistent

Even though collecting water from water source blocks with empty buckets in Creative mode now works as it is supposed to, collecting water from cauldrons is still incosistent. Instead of receiveing a water bucket, while still keeping an empty bucket, the empty bucket is the only thing you'll keep in inventory.

Clones MC-187472 and relates to MC-175492 and MC-194685.