Agreement may end decade-long dispute over Heritage Tower, which remains unfinished after nearly 40 years