Bug 13481 - sync branch with maven2

Summary: sync branch with maven2