mattdrayer/api-2632-fix: Fixed bugs related to proforma grade calculatio...

@chrisndodge -- merging most recent fix for MCKIN-2632, which has been merged to master