[bug 994538] Added Cancel button in Change password area

Fixes Issue with l10n on cancel button
Merge http://github.com/mozilla/kitsune