MAINT-1986: patch OPSDEV-111 fix (rev 9346b73d6843) from server-trunk
MAINT-1986: patch OPSDEV-111 fix (rev 9346b73d6843) from server-trunk

gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm,gabeharms/firestorm