Merge branch 'tp/dbus-fix' into ibm_next_20_tmp
Merge branch 'tp/smnotify_2' into ibm_next_20_tmp