Merge feature5837: support of K8s 82/8182/1 v7.0.0 v7.0.0rc1 v7.0.1rc1
authorgarciadeblas <gerardo.garciadeblas@telefonica.com>
Mon, 18 Nov 2019 13:34:28 +0000 (14:34 +0100)
committergarciadeblas <gerardo.garciadeblas@telefonica.com>
Mon, 18 Nov 2019 13:34:28 +0000 (14:34 +0100)
Change-Id: I4567a0fc1f155a40ea1f81b2a645aad65488ebf4
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

Trivial merge