Commit the real fix.
r395185 did not fix fetch stage While I'm here, move LICENSE to make portlint happy.