Merge "Fix mdsal-netconf-connector dependencies" into stable/neon