MP1-3172 : Reopened issue to fix the shutdown timeout bug
This is a newly created branch based on Revision 1.6.0
Merge tag '1.7.0_Pre_Release' into MP1-3172_TVService_ignores_shutdown_(reopened)
Merge remote-tracking branch 'remotes/origin/MP1-3172_TVService_ignores_shutdown_(reopened)'
Merge remote-tracking branch 'remotes/upstream/master' into 1.6.0Fork-BDJ