Army raises enlistment age to 42, removes waiver for marijuana possession