Merge "packaging: cleanup" into tizen