Packages from the vendor tjn

tjn/elastic
tjn/mpdo