Merge in RED/persistence-service from RED-5293 to master * commit '92326e82f572c62f275c98fc47d1848e47f2c2ea': RED-5293: 500 for invalid tenant RED-5293: 500 for invalid tenant RED-5293: 500 for invalid tenant RED-5293: 500 for invalid tenant RED-5293: 500 for invalid tenant RED-5293: 500 for invalid tenant