This fixes failures for PyYAML new version and lower constraints. Change-Id: Iba863242365c4be63495600b741513c2ca0ea9b0