Add merge of 'application' and 'plan' objects

Closes-Bug: #1276927
Change-Id: I9e03b887b1517885e20f355a011f3db600db2fbe