Update patch tools to handle latest knife-essentials
Fix diff_spec on Solaris