merged from 7.1-RELEASE-JNPR