dev guide updates for 4.1

Signed-off-by: radhikap <radhika.puthiyetath@citrix.com>
Persistent Networks documentation:Reviewed-By: Jessica Tomechak and Likitha Shetty
Docs: Fixed typo in nicira plugin guide
CLOUDSTACK-1272: Fix incorrect annotation for service offering id

Fixes param annotation in:
   api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterCmd.java
   api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
   api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
maven: Fix stray characted in client/pom.xml introduced in 4572bc06

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
event and merge issues fixed