John Lewis has agreed to anchor the 1.7m sq ft Edinburgh St James development after settling a disagreement with the city’s council.