Merge "icnss: Reduce the shutdown timeout from 50sec to 15sec"