Issue #2321739 by jibran: Fixed Minor issue in EntityReferenceRelationshipTest.
Issue #2319977 by marcingy: Convert sql query in buildForm in NodeTypeDeleteConfirm to efq.