Fix for BZ-1110392 - Dashboard builder 6.0.x/6.1.x API incompatibility.
(cherry-picked from 14bcd26)