Merge branch 'release_v2014.1.4' into 2014.1
fixed error line 137 in iptables - missing ':' in for loop
Allow schedules to work in multimaster.

This change allows schedules to work in multimaster. I've had to revert to a single master config for now since 2014.1.4 (the latest EPEL version) contains this bug.

I did try this with a single master setup. It does appear to work.

The code in the develop version looks very similar and may be similarly broken.
Handle terminal ECS sequences.
Python <= 2.6 does not suppor the timedelta.total_seconds() method. Add a wrapper.
Merge pull request #13200 from jhenry82/total_seconds_python26

Add wrapper function for total_seconds()
Better way to escape ldap metacharacters
Forgot import
Forgot import
Make test match new umask change.
Merge commit
Merge pull request #13207 from cro/fix_umask_test

Fix umask test
Merge pull request #13206 from cro/ldap_metacharacters5

Better way to escape the ldap filter and username
Don't escape in output/highstate
Fix shell call test
Unresolvable master dns entry should not result in 127.0.0.1 if retry_dns not set.
Unresolvable master dns entry should not result in 127.0.0.1 if retry_dns not set.
Remove commented address assignment
Strip trailing path separator from gitfs_root
Merge pull request #13255 from cro/esc_sequences2

Filter terminal escape sequences