Merge branch 'hotfix/4153'

Close #4153
Catch LogicException for Rewind and fix CP errors

The rewind method is, as the valid() method, affected by an issue
with the GlobIterator where it throws a LogicException if the dataset
is empty (https://bugs.php.net/bug.php?id=55701).

This exception should be caught and correctly returned as this will
interfere with foreach statements at the invoker.

In addition to the above have several copy-paste errors in the
DocBlocks been fixed.
Merge branch 'hotfix/4154' into develop

Forward port #4154