update ControlPlane to 1.5.4
Merge pull request #6919 from jconley/controlplane

update ControlPlane to 1.5.4