Merge "Fix enabling of FailFast mechanism." into lmp-dev
Robert Greenwalt [Fri, 10 Oct 2014 17:55:08 +0000 (17:55 +0000)]

Trivial merge