cris branch
Meerge dev-api to trunk ( -r50861:54841 )
Add hystrix configuration for rest statistics calls