Going back to using a public non-transient property to avoid DML error.
Using the redisplay property of apex:inputSecret. (And fixing test.)
Merge pull request #843 from SalesforceFoundation/feature/838-addr-settings-dmlerror

Feature/838 addr settings dmlerror
Merge dev into feature/362-trial-walkthrough