Cleaned abort method and imported HttpException
Merge pull request #6495 from joecohens/fix/clean-abort-code

[5.0] Cleaned abort method and imported HttpException