ChrootDirectory was added in 5.0
Sync keyword
Merge branch '5.8p2' into 5.9p1

* 5.8p2:
  Sync keyword
  ChrootDirectory was added in 5.0

Conflicts:
	Makefile
Merge branch '5.9p1' into 6.1p1

* 5.9p1:
  Sync keyword
  ChrootDirectory was added in 5.0