Merge "modify Klockwork bug" into tizen_2.2