Fix spiff merge on properties.cf
Fix spiff merge on properties.cf

cloudfoundry/cf-riak-cs-release,mikfreedman/cf-riak-cs-release,cloudfoundry/cf-riak-cs-release,datianshi/cf-riak-cs-release,datianshi/cf-riak-cs-release,mikfreedman/cf-riak-cs-release,mikfreedman/cf-riak-cs-release,datianshi/cf-riak-cs-release,mikfreedman/cf-riak-cs-release,cloudfoundry/cf-riak-cs-release,cloudfoundry/cf-riak-cs-release,datianshi/cf-riak-cs-release