Bump to version 1.2
Fix SIGTERM handler to clean up pidfile

This also bumps the version to 1.2.1 for this fix.
Merged upstream changes

Merge remote-tracking branch 'upstream/master'

Conflicts:
	nagios-api