Merge branch 'stable-2.12' - Switch from soap to rest api Change-Id: Ia907d24334eb757f847d246d641214a9a2859d77