New Thai draft constitution extends junta rule