Fix for Bug#239

Keys in models replaced by config false (as library does not use the models as configuration)
 - rebased

Change-Id: I9e6311d912ce0fc89d8d71789366752f3764e86c
Signed-off-by: SahilShah <sahil4.s@tcs.com>
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
Merge "Fix for Bug#239"