Agniveers to get option of two more years in armed forces