Add storage for static constants in RollCtrl.cpp
Merge commit '7ade59d0d4'