Re-merging in Pull Request #2 as a separate branch
Revert "Adding NetBeans build files"

This reverts commit 4533456c272b29bc421dddf7f152b16ceabc0b45.
Merging in branch RPC_Support
Merging in branch Ivy2