Fix supervisord start with stale pidfile

supervisord has a stale pidfile sometimes
during Fuel container upgrades.
Also corrected whitespace issues.

Reduced wait time for processes to 5s so that
init script doesn't exceed its max timeout.

Change-Id: I6e5511f5fcce0205283594a290e72084b20e6aa7
Closes-Bug: #1361756
Merge "Fix supervisord start with stale pidfile"