Sync requirements with stable/havana requirements

Change-Id: I401fd276633f7bf41d6c9fbeb5255fdaf44e9ead