Merge pull request #4528 from CyrusBiotechnology/smlewis/foldtree_nc remove foldtree nonconst begin/end for compile improvements. Resolves #4517