Merge "Adds setting to disable SSL cert validation"