Merge pull request #449 from tkolhar/master

fixed failing headpin cli tests
Merge pull request #451 from tkolhar/master

fixed failing headpin cli tests
Finally: got green.
Merge branch 'longrun'
fixed failing headpin tests for Org