Merge "Candidate fix for dependency issue in odl-restconf feature"