Osp-Installer merge changes from tizen_2.2