Egypt to re-draft Oil &#038; Gas contracts by end of 2018, adding new E&#038;P incentives