Reverting to my @linode snapshot. Need to do some thinking about this Confluence upgrade before trying again. Bad @atlassian, no cookie.
