Reduce code duplication around identity.
Change heat template max to match code default.
Support non-admin usage.