Fixed error in install_riak_cs of using variable before init.
Added property config for OSG to the install_riak test unit
Fixed merge conflict
Merge pull request #224 from zhill/testing

install_riak_cs will now configure the properties for osg for both riak and walrus depending on config