tree c1a38d7d9848a84d31772314abb524c12aafa9a5
parent aaac7ee1b70085929f99e55aa655fd7b3161863d
author Khen Nursimulu <knursimu@ciena.com> 1481568073 -0500
committer Zsolt Haraszti <zharaszt@ciena.com> 1481595875 -0800

- Fixes the Git merge issue.
- Specify the lxml version (latest version of 2 days ago is broken)

Change-Id: I819bbe378feb5b90d665eed25b4bef9ac7718411