merge ZynqTop changes into Zc706Top

Change-Id: I049a32e2c8aa8d35fc712dfd11115f8fc8b963f0