Prepare 1.5 branch for 1.5.1 release, updating versions and merging change 1097974 from trunk, adding a missing license header.