Whitespace fix - mostly to test from cluster
Fixes for cluster compatibility
Merge branch 'develop' of git.oicr.on.ca:gps/heliotrope into develop