Remove the restrictions around retry_count

Previously retry_count would only apply to builds that were either:
* on the master branch
* had 'merge on success' enabled

After this it will work the same for all builds.

@JackDanger @cheister