Tests for php 5.5
The new DocComment sniff was moved
Merge branch 'master' into phpcs-fixer
Updated tests to reflect sniff changes