BAP-7086: Code Review, round 1
	- pxphpmd issues
	- errstas