Trunk Broken

[Venkata Krishnan]

Hi,  I might have just about broken the trunk accidently commiting some half
baked changes to the policy module alongside with some fixes for license
headers.  I am right now fixing it.  I regret and apologize for  this
inconvenience.

Thanks

- Venkat