Addresses issue 2445 - CC-BY-3.0 template diverges from Creative Commons published text

[pmonks]

This PR addresses issue #2445 - "CC-BY-3.0 template diverges from Creative Commons published text".

HOWEVER

In updating the CC-BY-3.0.txt unit test to match the canonical version published by Creative Commons, issue #2431 was also triggered. As a result, this PR also merges in the fixes for that issue, making PR #2441 redundant.

As a reminder, issues #2431 and #2445 are unrelated, but just happen to intersect because they both involve changes in different parts of the CC-BY-3.0.txt unit test file.

Test results:

$ ./test-one-license CC-BY-3.0
WARNING: sun.reflect.Reflection.getCallerClass is not supported. This will impact performance.
License Creative Commons Attribution 3.0 Unported passed
$ ./test-one-license CC-BY-NC-3.0
WARNING: sun.reflect.Reflection.getCallerClass is not supported. This will impact performance.
License Creative Commons Attribution Non Commercial 3.0 Unported passed
$ ./test-one-license CC-BY-NC-ND-3.0
WARNING: sun.reflect.Reflection.getCallerClass is not supported. This will impact performance.
License Creative Commons Attribution Non Commercial No Derivatives 3.0 Unported passed
$ ./test-one-license CC-BY-NC-SA-3.0
WARNING: sun.reflect.Reflection.getCallerClass is not supported. This will impact performance.
License Creative Commons Attribution Non Commercial Share Alike 3.0 Unported passed
$ ./test-one-license CC-BY-ND-3.0
WARNING: sun.reflect.Reflection.getCallerClass is not supported. This will impact performance.
License Creative Commons Attribution No Derivatives 3.0 Unported passed
$ ./test-one-license CC-BY-SA-3.0
WARNING: sun.reflect.Reflection.getCallerClass is not supported. This will impact performance.
License Creative Commons Attribution Share Alike 3.0 Unported passed

[jlovejoy]

Thanks @pmonks ! I'll review this more closely this week or weekend (on holiday / at conference the next couple days)

[xsuchy]

I want to thank you for merging these two PRs and two issues. My only problem previously was that they broke the tests, and after merging, they would break the test for all other pull requests, too.

+1 from me now.
I will leave it for @jlovejoy or somebody else to review the texts, as that is not my area of expertise.

[jlovejoy]

added comments on history to issue, but good to merge this. No change in the license text, just how it is grouped in those two bullet sections.