Removed instances of 'not in use' from code
Changed tests accordingly
CHANGES_NEXT_RELEASE updated
Merge branch 'develop' into hardening/empty_context_values_and_co

Conflicts:
	CHANGES_NEXT_RELEASE
Reverted back 'updateContext if' in ContextAttribute
Merge pull request #330 from telefonicaid/hardening/empty_context_values_and_co

Hardening/empty context values and co