alexander 619e454f68 Merging cs-17363 back to trunk. Manual merge of conflicted files. [ZF-7581] %!s(int64=16) %!d(string=hai) anos
..
services 619e454f68 Merging cs-17363 back to trunk. Manual merge of conflicted files. [ZF-7581] %!s(int64=16) %!d(string=hai) anos
testdata 4860700a82 merge tests for Auth and resources from incubator %!s(int64=16) %!d(string=hai) anos