Merge proposals dependent on lp://staging/~canonical-isd-hackers/canonical-identity-provider/fabric-makefile

1. fabric-makefile
2. Dependent merge proposals