postgres: Followup commit for ebcb7cd

Also allow the slave to have the datadir overriden
Update rspec tests as well

Change-Id: I0160bd695db0665dd2b4692de41635b37a3d0ba1