Original commit: elastic/x-pack-elasticsearch@2407eeabd3
This will conform to how we want the x-pack repo structured. relates elastic/x-pack-elasticsearch#3363 Original commit: elastic/x-pack-elasticsearch@f67e597bc8