merged from 6.3-RELEASE-JNPR