[OLINGO-63] Uri Parser: rename, cleanup, fixes