E. Hunter Harrison to remain with Canadian Pacific until 2017