CLOUDIFY-1705 Aligned timeouts in all rules