fix bug if you have other devices
Merge branch 'two-dot-o' of https://git-wip-us.apache.org/repos/asf/incubator-usergrid into two-dot-o
taking extra line out
Fixed incorrect strategy
Fixes bug with lifecycle manager cache lazy loading
Merge branch 'two-dot-o' into cloudformation-update