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.
Better way to escape ldap metacharacters
Forgot import
Forgot import
Merge commit
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
Merge pull request #13259 from cro/resolve_dns_fallthrough2

Unresolvable master dns entry should not result in 127.0.0.1 if retry_dns not set.
Merge pull request #13260 from terminalmage/issue13185-2014.1

Strip trailing path separator from gitfs_root (2014.1 branch)
Merge pull request #12959 from crasiak/2014.1

added fix to allow root=param in git declaration of ext_pillar, merged into 2014.1
Fix states.dockerio formating for py2.6.