Whistleblower David McBride strikes deal with Commonwealth