bug 370 bug 364 Use tenant uuid instead of name for RO NBI