AJCORE-914: Move original confg out of the way before installing alternate

Change-Id: Ie66342036efc10f6522de5b7720fd2394109ea2c
Signed-off-by: Steve Kinneberg <stevek@qce.qualcomm.com>
ASACORE-1136: Fix alljoyn.conf generation when 'all_networks=1'

Change-Id: I93feb34ff6f7e32649072c31141c93668c43e23b
Signed-off-by: Steve Kinneberg <stevek@qce.qualcomm.com>