Merge topic '11572-fix-state-button-name' into next

0129d1c Fix button name in pqFixStateFilenamesDialog
Merge topic '14117_build_nektar_plugin' into next

f6d2440 Using std::min and std::max instead of #define versions.