Make discipline a class skill for ALL classes.
The reasoning would be the same as it is with Lore - Discipline is simply too essential to skip and all optimal builds have it.
If the Loremageddon happened to take away mandatory UMD class dips, same should apply to Discipline IMO.