fix config xml format and unique retry max number
fix JSON dump format for php < 5.4.0
Merge branch 'master' into integration