Update vsite_preset.spaces.inc

Add os_biocv to spaces_features_available
Merge pull request #5600 from openscholar/5599-hotfix

Update vsite_preset.spaces.inc
Make Jons files/node term code compatable with nodeorder
Merge pull request #5604 from openscholar/fix_nodeorder

Make Jons files/node term code compatable with nodeorder
Merge branch 'SCHOLAR-3.11' into SCHOLAR-3.x