Merge "Upgrade: cp instead of mv" into tizen_3.0