PHPDoc cleanup
Merge pull request #3339 from tractorcow/pulls/3.1/phpdoc

PHPDoc and whitespace cleanup for FunctionalTest / TestSession