Cleanup for BZ#1013882 - Support setting of additional entities from Content Specification