Merge "Templates for configuration guide" into stable/brahmaputra