am 74e951f7: am 5551c39d: resolved conflicts for merge of 7c2acc7d to jb-mr2-dev

* commit '74e951f766ebe5c37e93a56d85d4400d5abbf64e':
  Assert that xattr support is in the kernel.