Merge "Add option to disable testing against external idp"