Merge pull request #29 from rajubairishetti/ubuntu-12.04

Port changes from master to ubuntu-12.04
update changelog entry for both collector and agent (for ubuntu12.04)