Fix catalyst web - cost time computation

Change-Id: I9ac396e1b310a5c78fee8af758001f5de69445db
Merge topic 'catalyst-web-composite' into master

dfcf9c7a Fix catalyst web - cost time computation