Original commit: elastic/x-pack-elasticsearch@489e43517c
Minor fixes to finish Marvel's agent integration into x-plugins project Original commit: elastic/x-pack-elasticsearch@5fd9501893
Original commit: elastic/x-pack-elasticsearch@6cd0a7d25c