Not importing proxy forms with "proxy" false and proxy details
Undoing commit 09e514ad5c1c0ec72e4ce387e5c1972b52a9bb1b

When breaking down the quota report by site we must use the participant's
preferred site and not their default site.
Merge remote branch 'origin/release' into develop