Branching Foreman 1.3

Whoooooo!

@dcleal - there is one extra fix for locale:find to have nicer commits -
after rebase just throw away eb163a7 and execute again