TRUNK-3709

TRUNK-3709

updated 1 test in OptionController and skipped 2 in ForgotpasswordForm
TRUNK-3709