Sync with global requirements

In addition, the test code was updated to fix a test failure. This
failure occurred due to a change of behaviour from the version we were
using of cliff, which now differs in version 1.7.0.

Change-Id: I06782928414561f7cb4088e385e82c882de4ff46