FIX RPM package so PID file is stored in /var/run/contextBroker instead of /var/log/contextBroker.
FIX path for PID file in configuration file
Merge branch 'develop' into hardening/612_pid_on_run_dir

Conflicts:
	CHANGES_NEXT_RELEASE
Merge pull request #662 from telefonicaid/hardening/612_pid_on_run_dir

Fixed RPM package so PID file is stored in /var/run/contextBroker