comment out the older, conflicting ETSI-specified values and use the more modern ones. Mark a couple of deprecated values as such (void). svn path=/trunk/; revision=45251