Fixes indentation for EUCA-3902
Merge branch 'team/clc-dev/CHUCK-33-MERGE' into testing