WFLY-3947: fixing calendar based timeout; also replacing problematic bui...

...ld test case with one matching original issue WFLY-1468

8.x cherry-pick of #6788