acu107420 upgrade flexmock to avoid nasty Test::Unit bug in 0.9x
acu107420 bump right_develop to pickup RSpec bug fix
Merge remote branch 'origin/teal_13_08_acu107420_test_unit_fix'

Conflicts:
	Gemfile.lock