d5297a - Resync with master

Authored and Committed by law 6 years ago
      - Resync with master
      - Drop local patch for 657588 that is no longer needed.
      - Drop lotch patch for nss-files-overflow that seems
        useless.
      - Repack patchlist.
    
        
file modified
+2 -0
file removed
-20
file modified
+11 -11
file modified
+2 -2