Merge "Fix project-name for netconf-pnp-simulator; fix timeout"