fixed errors in the headers:
- Bug 40
- Bug 25
- Bug 35

Patch set 2 reinstates the labels or status code

Change-Id: I28fc57587f828f3b3ed05d6e7a6dc77639a36abe
Signed-off-by: Michele Carignani <michele.carignani@etsi.org>