Move Riak node scripts to server folder
Move Riak node scripts to server folder (resolve merge)

Conflicts: