Merge pull request #345 from Ranjith15/obsplatform-2.03

popups for selfcare
..
Merge remote-tracking branch 'upstream/obsplatform-2.03' into obsplatform-2.03