(Issue430) Added graceful shutdown for express, mq and activity
Merge branch 'master' into issue-430

Conflicts:
	node_modules/oae-util/lib/mq.js
	node_modules/oae-util/lib/server.js
Fixing potential double-callback when queue fails to bind
Merge pull request #430 from mrvisser/issue-430

Shutdown lifecycle