Update to latest node and supervisor builds
Merge remote-tracking branch 'origin/master'

Conflicts:
	nodejs/makenodejsrpm.sh
	nodejs/nodejs.spec