Includes charmhelper sync and amulet test update to switch to api version2 on Pike+ as v1 has been dropped Change-Id: Ib7fac99f6987947dec9a09ef8354003520688b6d