OSL 1.5 compatibility

I've been doing some investigation into using OSL alongside Python in the Expression node, and as part of that needed to update the code to work with the latest OSL version. I've tested this locally with the current OSL master and also tested on Travis with the version we currently build with - OSL 1.4.