Osng 471

This pull request contains all changes for userstory #OSNG-471.
would it be an idear to rebuild the abstractOsiamService line 150 to 155 to just add the values of they are not null or empty? In this case you could also give an null into the builder setter