Break out 1.7.X environment from trunk