2.2.0 readiness
Merge branch 'releases/2.2.0'

2.2.0 readiness
Bump to dev version (2.2.1dev)
Merge branch 'version/bump'

bump to dev version
Does not render label outside button
Merge branch 'bakura10-fix-3014'
[#4452] Use constant values, not integers

- Use constant values, to make extension possible
Remove code munging

- Per the comments, changing the code value if it fell outside the range of the
  defined constants does not change how isValid() works, and does not allow for
  custom constants in extending classes, unless you also override the
  constructor.