Merge "Update netconf/master jjb configuration"