Reconcile definitions of stability.
Merge pull request #2171 from paulp/pr/stability

Reconcile definitions of stability.