Merge "Fix lshal --init-vintf may have empty <instance> tags." into oc-dev