Bug fix.
Added licenses.

Change-Id: Ia0f34183bb8c6d28c1a60a6dbe72c89b1191996d
Signed-off-by: Henning Schulz <henning.schulz@sap.com>