Merge pull request #291 from open-power/master

Merge v1.7 fixes back to master-next