Merge r322350 and related commits into 6.0 branch #35329
Description
| Bugzilla Link | 35981 |
| Resolution | FIXED |
| Resolved on | Jan 17, 2018 03:42 |
| Version | unspecified |
| OS | Linux |
| Blocks | #35152 |
Extended Description
r322350 fixes a bug after r321395 & r321396 and reported in the buildbots. That change disables hashing in the affected case. After that, a few small changes to get the test case fixed up. The complete list of changes requested to be merged:
Actual code change:
r322350
Fixing up test case:
r322405
r322420
r322593