Calculation step fixes
Merge branch 'hibernatefree' of github.com:openforis/calc into hibernatefree