Merge pull request #950 for Password Change script bootstrap conversion