Merge pull request #770 from pragupta/witherspoon_12_7

Fixes to get witherspoon xml working with latest hb