Predicting octanol/water partition coefficients using molecular simulation for the SAMPL7 challenge: comparing the use of neat and water saturated 1-octanol