Apply two patches for SMX4.0

[Jeff Yu]

Hi

Can someone help me review and apply below 2 JIRA's patch.

1.http://issues.apache.org/activemq/browse/SMX4NMR-5
2. http://issues.apache.org/activemq/browse/SMX4RUN-6

-- 
Thanks
Jeff