Merge "Add kubernets.client state" into release/2019.2.0