TRUNK-4123, 4124 - Mujir/Sushmita - Incorporating feedback from Wyclif, undoing changes for introducing order number