Merge pull request #338 from alram/next

Reviewed-by: Sage Weil <sage@inktank.com>

diff --cc src/upstart/ceph-mds-all-starter.conf
Simple merge

diff --cc src/upstart/ceph-mon-all-starter.conf
Simple merge

diff --cc src/upstart/ceph-osd-all-starter.conf
Simple merge

diff --cc src/upstart/radosgw-all-starter.conf
Simple merge