Fixed failing test on realtime.
Merge branch 'master' of github.com:AIFDR/inasafe into aggregator_wrappers
Move code for set up aggregator.target_field into separate method