Closes-Bug: #1401239

Issue: During setup_storage, provisioning hangs on supervisord
       nova/glance/cinder restarts. After analysis bug seems to
       be in supervisord package.
Fix: Added timeout and retry logic in storagefs to avoid hang
     issue during provisioning. (work around)

Code changes done based on review:
     1. renamed restart_services to restart_services_withtimeout
     2. decremented retries on try except block

Proper fix is to add supervisord working patch/latest supervisord
     package

Change-Id: I62f373ce03a08165e233f6ab98c0f6dcf8d23ace
Tests: Verified the above fix with storage provisioning
Merge "Closes-Bug: #1401239" into R2.0