Merged revision(s) 3356-3459, 3314-3356 from trunk:
Conflicts in VCodeSnip.vi were resolved by keeping parsnip copy unchanged. Conflict in VCodeSnipPortable.vi was due to the file being deleted from parsnip: changes were ignored.
This updates parsnip branch with changes made in trunk after updating re release 4.8.0.