Merge "Updating RestApi to RestconfApi"