Move patched files under monkey patch.
Write message cleanup to match core vagrant style.