Part one of fixes for issues in 70X BOOSTIO branch

git cms-merge-topic of this branch (apfeiffer1:fixBioPartOne) into the latest working BOOSTIO IB (..-16-0200) works fine, even if github claims it can't automatically merge - no idea why. :( 
First round of fixes for the boostio branch.