Merged heptapod branch for upstream 15.11 in heptapod-stable
Expected to fix in particular the failures of !94 (merged) once it gets rebased
Expected to fix in particular the failures of !94 (merged) once it gets rebased
assigned to @gracinet
merged