Use the same codding stile rules for Travis and dev.
Merge pull request #1089 from camptocamp/code-style

Use the same codding stile rules for Travis and dev.