Integrated patch to handle bucket names with dots in them.