Applied patch (FELIX-169) to fix how framework shutdown is handled, making it more symmetric to system start up.