Wrap up initial work on the DIC

Change-Id: Ibbfc635388a36c6c7a1bf01f986d4cf2cb9e0862
Work on EntitiesByPropertyValue API module

Change-Id: I6c285066cbb7617c5fcfd450d3bba1133e4342f9