Issue #2916376 by rlmumford, Sweetchuck, tim.plunkett: The @ContextDefinition annotation always kills the label and the description (cherry picked from commit 32f249ae)