Add merge support for serviceaccounts

All properties from a backup will be merged into the ServiceAccount
except for the default token secret.

Signed-off-by: Nolan Brubaker <nolan@heptio.com>

pkg/util/collections/map_utils_test.go

@@ -16,7 +16,9 @@ limitations under the License.
 
 package collections
 
-import "testing"
+import (
+	"testing"
+)
 
 func TestGetString(t *testing.T) {
 	var testCases = []struct {