Thailand scraps plan to bar junta-appointees from power