Merge "Add more yang/sal dependencies"