Moved all Apache 2 variants to 'Apache License, Version 2.0'
More Apache 2 consolidation