Merge "Fixed Builder not allowing nested maps for properties" into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 28 Jan 2016 18:39:58 +0000 (10:39 -0800)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Thu, 28 Jan 2016 18:39:58 +0000 (10:39 -0800)

Trivial merge