fix cli.ContentTests
added missing sam/headpin tests in headpin-tests.xml
marked failing tests
Merge pull request #264 from hhovsepy/master

fixed failing test
Merge pull request #261 from tkolhar/master

fixed cli.ContentTests
Merge remote-tracking branch 'upstream/master'
fixed failing CLI test cases, filled comments about BZs