Feature resolve conflicts 1634#55

sujata-m merged 2 commits intodevTaskarCenterAtUW/TDEI-python-osw-validation:devfrom

feature-resolve-conflicts-1634TaskarCenterAtUW/TDEI-python-osw-validation:feature-resolve-conflicts-1634Copy head branch name to clipboard