fix for ancestor composite indexes upon entity puts
consolidated code
fixed typo
Update app.yaml
Merge pull request #1597 from AppScale/ancestor-composite-issue

fix for ancestor composite indexes upon entity puts