upgrade s2oauth 2.1.0 RC3 and rest client builder