Issue #138: class enrollment validation messages
Merge branch '3.3.x'