Reviewed definitions to ensure they are according to OASIS rules (1/3 done)
Authored by: peter_bergstrom 2015-01-28
Parent: [r3852]
Child: [r3854]
