Guenther Steiner and the Haas F1 team have reached a resolution to their very public legal dispute surrounding the non-renewal of the former's contract.