Upgrade to Apache 2.2.23
Move Apache related stuff to packages/httpd