WIP name of service should be configurable
Merge branch 'master' into CDK-128

Conflicts:
	csa-war/src/main/java/nl/surfnet/coin/csa/api/control/ServicesController.java
	csa-war/src/test/resources/janus-json/sp.json
CDK-128 service name is configurable

reverted the provider name tag, this is used in multiple locations.
Merge branch 'CDK-128'