XD-502 Delete a trigger from Shell

Merged code from 508 and ran regression test.
XD-502 Updated code to meet code review requirements.

The b method attribute in removeModel has been renamed to beanFactory.
The catch block in TriggerDeployer has been removed, because it is handled upstream.
swapped "final static" with "static final" where applicable.

Fixed compile issues and tested after merge.