Merge in properties from user-specified stubs

Signed-off-by: Vick Kelkar <vkelkar@pivotal.io>
Signed-off-by: Chris Adams <cadams@pivotal.io>