Merge "fixed sonar issue in MsoTenantAdapter.java"