Merge proposals dependent on lp://staging/~kentb/ubuntu/trusty/sblim-cmpi-devel/fix-for-1269934

1. Trusty (14.04)
2. fix-for-1269934
3. Dependent merge proposals