Merge "Fix coretpk upgrade" into tizen