Merge stable into default (NON-TRIVIAL)
- dropping __future__ statement added by d2472948da9c
- added migration from 407acc41beb5 to migration file for 3.16.1
rql('SET X name "BoundaryConstraint" ''WHERE X is CWConstraintType, X name "BoundConstraint"')