Santos upholds redefinition of Colombia’s ‘armed conflict’