Updated from global requirements

It's done manually to prevent upgrading to alpha versions that'll
require updating conf sample file.

Change-Id: I914b9d24702fec12856f90d3c6806f40691453d3
Merge "Updated from global requirements"