Merge "Bug:1253 - Fix NPE in config pusher"