Fixes issues where VBR sizes aren't properly set
EUCA-5454
Merge branch 'maint/3.2/testing' into team/clc-dev/BROKER-20
Merge branch 'maint/3.2/testing' into team/clc-dev/BROKER-20