OPAL-2494: Using UriBuilders and fixed wrong put uri