Bug 869951 - Include Basic Auth side-by-side with Hawk Auth. Add script to generate keys on the command line. various other fixes