fixes for using `$cluster` in init scripts and `ceph-disk`

Reference issue: http://tracker.ceph.com/issues/8860
The changes had to be applied manually because the patch could not be applied cleanly.