Fixed bugs reported in 100015 case
Merge branch 'OPM-reports' of github.com:lwyszomi/commcare-hq into opm