Renaming role::haproxy to role::puppetproxy

To make clear the intention since haproxy could be used for other uses
as well. Minor cleanup as well

Change-Id: Id478b452618816f47903ad8298605623fb482255