Disable XML entity parsing

Fixes bug 1100282 and bug 1100279.

Change-Id: Ibf2d73bca17b689cfa2dfd29eb15ea6e7458a123
(cherry picked from commit 8a2274595ac628b2373eab0cb14690f866b7a024)
Ensure user and tenant enabled in EC2

Fixes bug 1121494.

Change-Id: Icc90d581691b5aa63754e076ce983dfa2885a1dc
(cherry picked from commit f0b4d300db5cc61d4f079f8bce9da8e8bea1081a)