Merged the two sets of www database connection params into one