Fix for PM-691
Merge branch '4.2'
Fix for PM-691

Conflicts:
	src/tools/pegasus-kickstart/statinfo.c