Only include not exposed capabilities when filter specifies so

Signed-off-by: Alin Dreghiciu <adreghiciu@gmail.com>
Merge remote-tracking branch 'origin/master' into capabilities-ui-rewrite