[uri] add scheme constants
[style] cleanup comment dividers "// --" because they are hard to maintain; rename toString() and toArray() methods to asString() and asArray(); group data provider methods at the end of test classes
[style] [test] add missing @param in a few tests
Merge branch 'develop'