Merge "fixed sonar issue in TenantAdapterRest.java"