Improve generated metadata for Web catalyst

Change-Id: I4417a89e1bdf9f71eee832fbce9406e667528209
Merge topic 'catalyst-web' into next

a01ac47 Improve generated metadata for Web catalyst