Fix kadira credentials
Merge branch 'master' into cfpb-sdbewd-grouptext