Revert "Removed generated part from service name instance to match it with input name."
Revert "Removed generated part from service name instance to match it with input name."

This reverts commit d97ddd644efc687b5da32669d64e8c85df5a8af9.

Signed-off-by: Marek Tomczewski <b8f517ce36d6e79015cc2772a688db5feb1db6a6@intel.com>

trustedanalytics/application-broker,trustedanalytics/application-broker