Fixing restart issue when monasca-setup is re-run

Change-Id: I106dedca53ff42b2520b17b0a9a10d8850844aba
Merge commit '3cd0cefd954fec7ad01ef7953d2338e835efae02'