Edinburgh World Heritage watchdog urges councillors to end Royal High School hotel saga