Merge proposals dependent on lp://staging/~aisrael/charms/precise/postgresql/fix-lint

lp://staging/~aisrael/charms/precise/postgresql/fix-lint has no merge proposals.