Merging commits from cloudfoundry/dea_ng up to 9546f34975b6e8af984c69b501f58dfc066cc901