Fix to custom message source to handle brackets without needing to escape them in message property files