Agnipath scheme revised: Agniveers to get 2-year service extension, option for regular enrolment after 6 years