Fixes the locked state from the comment form not showing for merge requests
Also fixes an rspec test that was failing because of this