Merge branch 'ibm-trunk' into ueinfo_with_downcall_locking