BISERVER-8790: Fixed security
Merge pull request #627 from sflatley/biserver-8789

BISERVER-8790: Fixed security