Updates for the new way of doing mandatory.
Merge bug26092
Remove some generated files so we can build twice.
Merge bug26094
Merge heads