Govt provides for OROP, pay panel despite earlier doubts