[CLC-917] Calling stop-trinidad before attempting to start
Merge pull request #462 from yuhunglin/CLC-917

[CLC-917] Calling stop-trinidad before attempting to start