alexander 619e454f68 Merging cs-17363 back to trunk. Manual merge of conflicted files. [ZF-7581] 16 anni fa
..
services 619e454f68 Merging cs-17363 back to trunk. Manual merge of conflicted files. [ZF-7581] 16 anni fa
testdata 4860700a82 merge tests for Auth and resources from incubator 16 anni fa