Use cleaner version from cookiecutter OpenStack template

In one of the review comments [1], russellb said that the code in
cookiecutter OpenStack template is more cleaner. So incorporate that
logic here.

[1] https://review.openstack.org/#/c/55111

Change-Id: I1a298bc6a2429f591b062bbfa3b0ce7122268cc5
Fix copyright header on test module

Clark and I wrote the code that was pulled in to this file this past
year. It's certainly not copyright 2011-2012, and in no way is it
copyright the foundation.

Change-Id: If89d2447948b03dfbbfd5b1e5387a043ce21e243
Merge "Use cleaner version from cookiecutter OpenStack template"