Modified config-parser to default to the uri attribute when both uri and...

... origin attributes exist