Applying patch for issue SA-CORE-2014-005
Applying patch for issue SA-CORE-2014-005, remove orig file