FELIX-4674 Applying extended patch by Dominique Pfister (thanks alot)

The extension to the patch is the addition of support for listing included protocols
and add more words to the metatype descriptions.


git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1633120 13f79535-47bb-0310-9956-ffa450edef68