Merge branch...

Merge branch '3426-test_validate_cylindrical_geometry_vs_rix-bragg-axis-position-is-nan' into 'master'

Resolve "test_validate_cylindrical_geometry_vs_rix : bragg axis position is NaN"

Closes #3426 (closed)

See merge request !4769 (merged)

(cherry picked from commit c7a3f6b0)

20184160 calc controller: clear cache for last calculation