ha: Put fs resource before vip one in order/colocation/group

The reason is that we started the fs one earlier on. With the vip
resource first, we would have to stop the fs primitive and then restart
to respect the order (ie, vip starts before fs).
Merge pull request #81 from vuntz/fix-order

ha: Put fs resource before vip one in order/colocation/group
Merge branch 'release/roxy/master' into roxy-sync-again
Merge pull request #82 from vuntz/roxy-sync-again

Merge roxy branch into stoney