Merge "Fix docker image for netconf-pnp-simulator to fix CSITs"