JUNIPER-ONLY: for PR 933461, 933540 and remove confiure user link