Bump characteristic version.

The latest version of service_identity requires a newer version of
characteristic.
Merge remote-tracking branch 'origin' into bump-characteristic-version

Conflicts:
	python-flocker.spec.in
Merge pull request #866 from ClusterHQ/bump-characteristic-version

Bump characteristic version.