Edinburgh councillors approve £15.5m temporary accommodation contract