GitFlow, when used correctly with Agile, solves all these problems quite well.