Merge pull request #1600 from rubenk/ceph-make-some-variables-static