Merge pull request #394 from mirage/master

more jenkins fixes
Merge pull request #395 from mirage/master

fix constraint