Merge proposals

alljoyn-core-1504 in Ubuntu has no merge proposals.