Enabled branch coverage for barbican.  Took out inclusive coverage.

Change-Id: Ie81ba92103e35962f5e85b1442237d6617f44736
Merge branch 'master' into verify-resource