after merge of conflicts
after merge of conflicts

vnitinv/ncclient,ncclient/ncclient,OpenClovis/ncclient,earies/ncclient,einarnn/ncclient,kroustou/ncclient,katharh/ncclient,cmoberg/ncclient,aitorhh/ncclient,leopoul/ncclient,GIC-de/ncclient,nnakamot/ncclient,joysboy/ncclient,nwautomator/ncclient,lightlu/ncclient