Bug 853838 - Clean up talos configs a bit. r=aki,jmaher