Edinburgh’s tourist trade has been given an extra six months to prepare for the introduction of a tourist tax.