Merge in logging changes in bleedingedge that allow for all instances of username / password to be redacted in the redacted log and redacts sensitive info by default