Merge pull request #100 from tgtshanika/master

Additional fixes suggested in patch review
Fixing issue APPM-241
Rename ApiMgtDAO class as AppMDAO.