Merge branch 'release_v2014.1.4' into 2014.1
fixed error line 137 in iptables - missing ':' in for loop
Merge pull request #12959 from crasiak/2014.1

added fix to allow root=param in git declaration of ext_pillar, merged into 2014.1