[WFLY-2407] Upgrading MSC + removing all MSC-136 workarounds