Revert "fixed S3 bucket options merge error"
Revert "fixed S3 bucket options merge error"

brian-kephart/camaleon-cms,owen2345/camaleon-cms,owen2345/camaleon-cms,brian-kephart/camaleon-cms,brian-kephart/camaleon-cms,owen2345/camaleon-cms