Bump stable/grizzly next version to 2013.1.4

Change-Id: I817767bcb618edf94363aa34dd0eb6ce897ce141
Fix regressions in unit test merge

Unit tests failed to run when Ming is available. This was
not caught in Jenkins because Ming has been removed from
test-requirements.

Change-Id: I048e614046071da8038e5e43815fbb7596106c6f
Added upper version boundry for six

The 1.4.0 version of six is not compatible with WSME 0.5b2.

This fixed bug #1219694.

Change-Id: Ifecf321865c98990b049d5df5de23eb1c90fd6c4
(cherry picked from commit 4e3351bc250a0b6278d71c4e6b88a147a9c762f5)
Merge "Fix regressions in unit test merge" into stable/grizzly
Catch exceptions from nova client in poll_and_publish

Ceilometer compute agent dies if nova client raises an exception while it is
retrieving server instances. This might happen e.g. when some OpenStack API is
temporarily unavailable

Conflicts:
	tests/agentbase.py
	tests/compute/test_manager.py

Fixes LP Bug #1218889
Change-Id: I808dcfae18d23240f8e095d6c97c8dede7dede8f
(cherry picked from commit 0e01da763ab7b3783ae86aa6582c38ebdc6e2378)
Consume notification from the default queue

Closes-Bug: #1209198

(cherry picked from commit 4c4434de205600ed7f510a984445053dc46c60c4)

Conflicts:
	doc/source/install/manual.rst

Change-Id: I4fe5d269b0055206729d68b1f6b4ef7d39e88f23
Merge branch 'stable/grizzly' of https://github.com/openstack/ceilometer into grizzly