Merge proposals dependent on lp://qastaging/~macslow/notify-osd/phablet-fix-link-error-on-raring-armhf

1. phablet-fix-link-error-on-raring-armhf
2. Dependent merge proposals