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