Whamcloud - gitweb
Merge fixes from b_md to HEAD so tinderbox can run.