Merge "core: Entity ID is not set or invalid"
authorzuul <zuul@gerrit.asterisk.org>
Tue, 16 Aug 2016 15:03:20 +0000 (10:03 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Tue, 16 Aug 2016 15:03:20 +0000 (10:03 -0500)

Trivial merge