Don't blow away empty consumption values on import
Merge pull request #2585 from dimagi/consumption_fixes

Don't blow away empty consumption values on import