Revert "Replace license classifier"

This reverts commit 3dcdcbde64.

Reason for revert:
There is still on-going discussion about the new license expression
and it may be changed in a near future. Until we get more stable
conclusion let's stick with the older format. See [1] to find details.

[1] https://review.opendev.org/c/openstack/nova/+/951226

Change-Id: Ic87fdba9d2dde5657fc2a4a8d640dd227321d6c1

setup.cfg

@@ -4,7 +4,6 @@ url = http://launchpad.net/python-heatclient
 summary = OpenStack Orchestration API Client Library
 description_file =
     README.rst
-license = Apache-2.0
 author = OpenStack
 author_email = openstack-discuss@lists.openstack.org
 home_page = https://docs.openstack.org/python-heatclient/latest
@@ -15,6 +14,7 @@ classifier =
     Environment :: OpenStack
     Intended Audience :: Information Technology
     Intended Audience :: System Administrators
+    License :: OSI Approved :: Apache Software License
     Operating System :: POSIX :: Linux
     Programming Language :: Python
     Programming Language :: Python :: 3