Bug 894230
Use strong consistency properly and when creating an app
Merge pull request #1229 from danmcp/master

Bug 894230