[CDI] add descriptive service properties and some cleanup Signed-off-by: Raymond Auge <rotty3000@apache.org>