Remove copyright from empty files

According to policy change in HACKING:
http://docs.openstack.org/developer/hacking/#openstack-licensing
empty files should no longer contain copyright notices.

Change-Id: Iba09a00f24dfbd1cd03c1c9f70ea216788e64d93
Closes-Bug: #1262424
Fix keyring issue where there were name space problems

The import of keyring conflicted with a string named keyring

Change-Id: I7416ea1cf453a126dd03dba8bc2900cad35ed2da
Closes-bug: #1271987
Merge "Remove copyright from empty files"
Merge "Fix keyring issue where there were name space problems"