Licensing: Move up note on declared vs concluded license disagreement

[bact]

• Currently the note about what to do when there is a disagreement between hasDeclaredLicense and hasConcludedLicense is buried down the bottom of the page
• It is also not very noticeable due to the fact that it has no proper heading, make it looks like it is under the "hasConcludedLicense" section. Which in fact, it is not. The last two paragraphs are meant to be at the "root" level of the description.
• This PR move up the note to the position next to the paragraph that introduces hasDeclaredLicense and hasConcludedLicense concepts.

[goneall]

@swinslow @zvr - Can you do a quick review - if OK, we'd like to merge

[goneall]

@bact - could you update to resolve the merge conflicts?

@swinslow - Please take a look - if you agree, we can merge.

[bact]

@goneall Conflict resolved.

[swinslow]

LGTM -- I did notice one typo (not from your PR) -- if you want to fix that now as well, great! Otherwise looks good to go as-is.

[goneall]

Typo fixed - LGTM