SSP-3011 Restore conditionality of Journal comment requirement